From: Florian Müllner Date: Sat, 12 Feb 2022 15:58:06 +0000 (+0100) Subject: boxpointer: Make drawing arrow background optional X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~530^2^2~2 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=514558409c4ec2a4ee643dc6bb1b8125167c9d16;p=gnome-shell.git boxpointer: Make drawing arrow background optional We currently use get_color(), which assumes the color exists in the stylesheet (and prints a warning if it doesn't). Switch to lookup_color() and skip filling the background if no such colors exits. Part-of: --- diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js index 1db8e56af..b3b98f83a 100644 --- a/js/ui/boxpointer.js +++ b/js/ui/boxpointer.js @@ -278,8 +278,6 @@ var BoxPointer = GObject.registerClass({ let halfBorder = borderWidth / 2; let halfBase = Math.floor(base / 2); - let backgroundColor = themeNode.get_color('-arrow-background-color'); - let [width, height] = area.get_surface_size(); let [boxWidth, boxHeight] = [width, height]; if (this._arrowSide == St.Side.TOP || this._arrowSide == St.Side.BOTTOM) @@ -422,8 +420,12 @@ var BoxPointer = GObject.registerClass({ Math.PI, 3 * Math.PI / 2); } - Clutter.cairo_set_source_color(cr, backgroundColor); - cr.fillPreserve(); + const [hasColor, bgColor] = + themeNode.lookup_color('-arrow-background-color', false); + if (hasColor) { + Clutter.cairo_set_source_color(cr, bgColor); + cr.fillPreserve(); + } if (borderWidth > 0) { let borderColor = themeNode.get_color('-arrow-border-color');